Matthew Leeds [Wed, 30 May 2018 02:09:07 +0000 (19:09 -0700)]
ci: Use master branch as flatpak tag
Closes: #1607
Approved by: jlebon
Matthew Leeds [Wed, 30 May 2018 01:24:54 +0000 (18:24 -0700)]
ci: Bump flatpak build to F28
Closes: #1607
Approved by: jlebon
Philip Withnall [Mon, 28 May 2018 16:06:46 +0000 (17:06 +0100)]
lib/repo-pull: Support retries for delta superblocks
Use the recently introduced architecture for retrying network requests
on transient failure to do the same for delta superblock requests, now
that they’re queued.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1600
Approved by: jlebon
Philip Withnall [Mon, 28 May 2018 15:55:05 +0000 (16:55 +0100)]
lib/repo-pull: Support queuing delta superblock requests
Just like all the other requests made for delta parts and objects by the
pull code, use a queue for delta superblocks. Currently this doesn’t do
any prioritisation or retries after transient failures, but it could do
in future.
This means that delta superblocks are now subject to the parallel
request limit in the fetcher, which was a problem highlighted here:
https://github.com/ostreedev/ostree/pull/1453#discussion_r168321706.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1600
Approved by: jlebon
Philip Withnall [Wed, 30 May 2018 11:20:49 +0000 (12:20 +0100)]
lib/fetcher: Factor out HTTP status code handling from soup and curl
Use the same G_IO_ERROR_* values for HTTP status codes in both fetchers.
The libsoup fetcher still handles a few more internal error codes than
the libcurl one; this could be built on in future.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1594
Approved by: jlebon
Philip Withnall [Wed, 30 May 2018 11:00:22 +0000 (12:00 +0100)]
lib/repo-pull: Add some missing assertions for progress statistics
Various of the counters already have assertions like this; add some more
for total paranoia.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1594
Approved by: jlebon
Philip Withnall [Mon, 28 May 2018 15:25:53 +0000 (16:25 +0100)]
tests: Test pull behaviour when network timeouts occur
Extend test-pull-repeated.sh to test error 408 as well as error 500, to
ensure that the new retry-on-network-timeout code in ostree-repo-pull.c
correctly retries.
Rather than the 200 iterations needed for the error 500 tests, only do 5
iterations. The pull code internally does 5 retries (by default), which
means a full iteration count of 25. That seems to be sufficient to make
the tests reliably pass, in my testing — we can always bump it up to 200
/ 5 = 40 in future if needed (to put it in parity with the error 500
tests).
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1594
Approved by: jlebon
Philip Withnall [Mon, 28 May 2018 15:24:33 +0000 (16:24 +0100)]
ostree/trivial-httpd: Add --random-408s command line option
This is exactly like the --random-500s option, except that it will cause
error 408 (request timeout) to be returned, rather than error 500
(internal server error).
This will be used in a following commit to test pull behaviour when
timeouts occur.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1594
Approved by: jlebon
Philip Withnall [Fri, 25 May 2018 14:49:18 +0000 (15:49 +0100)]
lib/fetcher-soup: Map more SoupStatus codes to known GIOErrors
This allows the retry code in ostree-repo-pull.c to recover from (for
example) timeouts at the libsoup layer in the stack, as well as from the
GSocket layer in the stack.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1594
Approved by: jlebon
Philip Withnall [Tue, 22 May 2018 11:21:45 +0000 (12:21 +0100)]
lib/repo-pull: Support retrying requests on transient network errors
Allow network requests to be re-queued if they failed with a transient
error, such as a socket timeout. Retry each request up to a limit
(default: 5), and only then fail the entire pull and propagate the error
to the caller.
Add a new ostree_repo_pull_with_options() option, n-network-retries, to
control the number of retries (including setting it back to the old
default of 0, if the caller wants).
Currently, retries are not supported for FetchDeltaSuperData requests,
as they are not queued. Once they are queued, adding support for retries
should be trivial. A FIXME comment has been left for this.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1594
Approved by: jlebon
Matthew Leeds [Tue, 29 May 2018 01:03:42 +0000 (18:03 -0700)]
Fix building P2P code against old glib versions
When building the OstreeBloom code against old versions of glib, we have
to have the libglnx headers included so that it defines
G_DEFINE_AUTOPTR_CLEANUP_FUNC and friends for us.
This is similarly true for test-repo-finder-mount.c which indirectly
includes ostree-autocleanups.h.
Closes: #1605
Approved by: cgwalters
Matthew Leeds [Sat, 26 May 2018 01:01:35 +0000 (18:01 -0700)]
find-remotes: Fix unused variable warnings
Closes: #1605
Approved by: cgwalters
Matthew Leeds [Sat, 26 May 2018 00:48:39 +0000 (17:48 -0700)]
Allow compiling OstreeRepoFinderAvahi without libsoup
Closes: #1605
Approved by: cgwalters
Matthew Leeds [Fri, 25 May 2018 22:46:34 +0000 (15:46 -0700)]
Allow compiling with experimental API but without curl/soup
This commit rearranges a few things in ostree-repo-pull.c so that OSTree
will successfully compile with experimental API enabled and without
libsoup, libcurl, or avahi:
./autogen.sh --enable-experimental-api --without-soup --without-curl
--without-avahi
This is accomplished with two sets of changes:
1. Move ostree_repo_resolve_keyring_for_collection() so it can be used
even without libsoup or libcurl.
2. Add stub functions for ostree_repo_find_remotes_async() and
ostree_repo_pull_from_remotes_async(), and their _finish() counterparts,
so they return an error when libsoup or libcurl isn't available.
Closes: #1605
Approved by: cgwalters
Jonathan Lebon [Tue, 29 May 2018 14:23:31 +0000 (10:23 -0400)]
.gitmodules: Update URL for libglnx
Same thing as https://github.com/projectatomic/rpm-ostree/pull/1374.
Otherwise we get an annoying "warning: redirecting to" message.
Update submodule: libglnx
Closes: #1604
Approved by: cgwalters
Matthew Leeds [Tue, 29 May 2018 13:38:49 +0000 (06:38 -0700)]
Update libglnx to get g_autoptr backports
Update submodule: libglnx
Closes: #1603
Approved by: jlebon
Jonathan Lebon [Mon, 28 May 2018 19:22:14 +0000 (15:22 -0400)]
ci: Drop gpgme and libgcrypt hacks
These shouldn't be needed anymore in F28.
Closes: #1601
Approved by: cgwalters
Jonathan Lebon [Mon, 28 May 2018 19:21:19 +0000 (15:21 -0400)]
ci: Bump to f28, except flatpak
We successfully switched to F28 in rpm-ostree. Time to follow suit here.
We exclude flatpak for now since we're still hitting test issues there
on F28.
Closes: #1601
Approved by: cgwalters
Jonathan Lebon [Mon, 28 May 2018 19:20:06 +0000 (15:20 -0400)]
ci: Stop layering oci-kvm-hook
Since we're explicitly using `--device /dev/kvm`, there's no need to
install `oci-kvm-hook`.
Closes: #1601
Approved by: cgwalters
Philip Withnall [Tue, 22 May 2018 11:20:15 +0000 (12:20 +0100)]
lib/repo-pull: Factor out enqueue function for FetchStaticDeltaData
This introduces no functional changes, but will make upcoming support
for retrying downloads easier to add.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Philip Withnall [Tue, 22 May 2018 11:19:15 +0000 (12:19 +0100)]
lib/repo-pull: Factor out enqueue function for FetchObjectData
This introduces no functional changes, but will make upcoming support
for retrying downloads easier to add.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Philip Withnall [Tue, 22 May 2018 11:17:38 +0000 (12:17 +0100)]
lib/repo-pull: Factor out enqueue function for ScanObjectQueueData
This introduces no functional changes, but will make upcoming support
for retrying downloads easier to add.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Philip Withnall [Tue, 22 May 2018 11:16:06 +0000 (12:16 +0100)]
lib/repo-pull: Rename a variable
Rename from `fdata` to `fetch_data` to clarify things and make it
consistent with other similar functionality in the file.
This introduces no functional changes.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Philip Withnall [Tue, 22 May 2018 11:14:22 +0000 (12:14 +0100)]
lib/repo-pull: Factor out free function for FetchDeltaSuperData
This introduces no functional changes, but does make the code a little
cleaner.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Philip Withnall [Fri, 25 May 2018 00:01:52 +0000 (01:01 +0100)]
lib/repo-pull: Use GCC `?:` ternary shortcut where appropriate
This introduces no functional changes; just makes the code a bit shorter
in a few places.
https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Philip Withnall [Tue, 22 May 2018 11:13:08 +0000 (12:13 +0100)]
lib/repo-pull: Use values from struct in enqueue_one_object_request()
This introduces no functional changes, but will make some upcoming
refactoring a little easier.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1599
Approved by: jlebon
Alexander Larsson [Thu, 17 May 2018 08:06:24 +0000 (10:06 +0200)]
fsck: Add --all to print all corrupted object
Stopping on the first error is nice if you just want to know if everything is ok, but
if you want to figure out all that is wrong its nice to be able to continue and
print all corruptions.
Closes: #1591
Approved by: cgwalters
Alexander Larsson [Thu, 17 May 2018 08:05:49 +0000 (10:05 +0200)]
fsck: Include the commits that contain the corruption in errors
This makes it easier to figure out what the corruption affects.
Closes: #1591
Approved by: cgwalters
Matthew Leeds [Thu, 24 May 2018 07:08:57 +0000 (00:08 -0700)]
bash-completion: Don't add a space after files and directories
Currently if ostree is completing a file or directory for you it adds a
space to the end, but this is an inconvenience when it's an intermediate
directory in a tree. It's better to let the user add the space after the
final directory, so this commit changes the bash completion to avoid
adding a space when completing files or directories.
Closes: #1598
Approved by: jlebon
Colin Walters [Mon, 30 Apr 2018 15:19:17 +0000 (11:19 -0400)]
lib/sysroot: Add wrapper API to prune system repository
The initial motivation for this is that the "staging" code currently
didn't rewrite the deployment refs, meaning that the staged commit
could be pruned.
Hence first, this new API ensures that deployments also
hold a strong ref to their commit, without relying on the magical
"deployment refs" that we inject. That has always been a weird
artifact of the strict layering separation between OstreeSysroot
and OstreeRepo.
I also plan to change rpm-ostree to start using this API to
hold references to base layers for client-side layering; it also
today generates various refs.
That said, if we still want to support multiple processes
writing to a single repo (as happens on EndlessOS today) we
still need to write refs; perhaps later we could add a concept
of "generators" or something that create refs based on whatever
logic?
Another minor thing this fixes is that we had a printf inside
the library; this propagates the pruned data to the higher level
which can log however it likes.
Closes: #1566
Approved by: jlebon
Colin Walters [Mon, 30 Apr 2018 14:31:33 +0000 (14:31 +0000)]
lib: Add a public helper method for pruning to find all ref'd commits
Prep for reworking how we do sysroot cleanup. We're going to
start doing more lowlevel pruning work there, and I wanted to avoid
duplicating the ref enumeration.
Closes: #1566
Approved by: jlebon
Andrea Galbusera [Tue, 15 May 2018 06:29:28 +0000 (08:29 +0200)]
u-boot: add support for devicetree
Likewise the corresponding support for syslinux introduced by commit
c5112c25e4519835c4cd53f4350c1b2f2a477746, this one enables writing devicetree
filename into the uEnv.txt environment file for u-boot.
Since u-boot does not strictly defines variable names, here 'fdt_file' was
chosen as it appear to be one the most frequently adopted names in u-boot
default environments. Outer boot logic should of course comply with this choice
and use $fdt_file as the device tree file name to pass to boot commands.
This was tested on a custom board booting with u-boot.
Closes: #1590
Approved by: cgwalters
Arnaud Rebillout [Mon, 14 May 2018 04:36:14 +0000 (11:36 +0700)]
docs: var/local -> var/usrlocal
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Closes: #1588
Approved by: jlebon
Jonathan Lebon [Fri, 11 May 2018 19:03:58 +0000 (15:03 -0400)]
ci: Add .papr-ex.yaml
I'd like to start working towards migrating the OSTree CI towards the
new PAPR model running in PACI. In order to take it for a test drive
(pun intended) without yet replacing our current CI, the new PAPR now
knows to look for a `.papr-ex.yaml` file. So as to not conflict with the
current PAPR, no GitHub statuses will be output other than a
`required-ex` label, which plays the same role as `required`. For more
information, see:
https://github.com/projectatomic/papr/commit/
85b1d0a91eba6597d01b52b674de38a876f030fe
The `.papr-ex.yaml` version is essentially the same except for:
1. the `FAH27-insttests` suite runs directly in the scheduled container
(notice the new `kvm: true` key)
2. the `host:` based contexts (rpm-ostree and flatpak) are missing since
we don't support provisioning a host just yet
Keeping them in sync could get annoying, though building confidence in
the new approach will allow us to migrate faster.
Closes: #1587
Approved by: cgwalters
Colin Walters [Fri, 11 May 2018 14:40:59 +0000 (10:40 -0400)]
Post-release version bump
Closes: #1586
Approved by: jlebon
Colin Walters [Fri, 11 May 2018 12:59:31 +0000 (08:59 -0400)]
Release 2018.5
Lots of stuff queued up.
Closes: #1585
Approved by: jlebon
Colin Walters [Thu, 3 May 2018 21:29:06 +0000 (17:29 -0400)]
lib/sysroot: Add OSTREE_EX_STAGE_DEPLOYMENTS environment variable
I feel like I'm drowning in a pile of experimental-but-almost-stable
features...
Anyways, since we made the feature opt-in in rpm-ostree in
https://github.com/projectatomic/rpm-ostree/pull/1352
let's mirror that a bit here with an environment variable so people
can play with it more easily.
The tests needed some tweaks; specifically we need to reload the
status fact after making changes. I'm still a bit uncertain
about the Ansible-as-tests.
But we add an upgrade test that uses the new environment variable.
Closes: #1583
Approved by: jlebon
Colin Walters [Wed, 9 May 2018 14:46:37 +0000 (07:46 -0700)]
tests/installed: Disable all rpmmd repos
For the same reason we do in the rpm-ostree tests. This also
made sure the test run worked when I was offline on a plane.
Closes: #1583
Approved by: jlebon
Colin Walters [Wed, 9 May 2018 21:45:32 +0000 (14:45 -0700)]
ci: Switch libgcrypt URL
Since the previous one wasn't made into an update, it got GC'd.
Closes: #1584
Approved by: jlebon
Jonathan Lebon [Mon, 7 May 2018 12:55:15 +0000 (08:55 -0400)]
libglnx: Bump to fix F28 compilation
Pull in https://github.com/GNOME/libglnx/pull/104 to fix compiling on
F28.
Update submodule: libglnx
Closes: #1580
Approved by: cgwalters
Jonathan Lebon [Mon, 7 May 2018 13:41:27 +0000 (09:41 -0400)]
docs: Add "Hello World" example
Let's get practical faster in the manual and have a simple "Hello World"
example right off the bat to hopefully make it easier to grok how OSTree
works.
Also some minor tweaks on wording around comparisons to git.
Closes: #1581
Approved by: cgwalters
Colin Walters [Tue, 8 May 2018 04:02:12 +0000 (21:02 -0700)]
ci: Drop str hotpatch
The change we want is in the current Fedora repos, and git master
is broken:
> qemu-system-x86_64: -vnc :1: Failed to start VNC server: Failed to bind socket: Address already in use
https://pagure.io/standard-test-roles/pull-request/186#comment-52440
Closes: #1582
Approved by: jlebon
Tobias Mueller [Sat, 5 May 2018 20:00:06 +0000 (22:00 +0200)]
repo: handle GPG_ERR_AMBIGUOUS_NAME in sign_data
This should give a more insightful error message if the user provides
a UID which is present on multiple keys.
This happens if you have an old key in your keyring which you are not
actively using any more, e.g. because it is too old. You still have
your old keys in your keyring, because you want to read old email
encrypted for that key, though.
The gpgme function used by ostree right now complains if a UID is found
on multiple keys:
https://www.gnupg.org/documentation/manuals/gpgme/Listing-Keys.html#index-gpgme_005fget_005fkey
The used API is too simple for that use case.
Note that it would be nicer if ostree picked the only valid signing key out
of the available keys rather than using the simplistic gpgme_get_key
function. It be nicer, of course, if there was such a gpgme function.
Closes: #1579
Approved by: cgwalters
Colin Walters [Fri, 4 May 2018 17:51:13 +0000 (13:51 -0400)]
tests: Fix installed tests more
OK so I noticed that something was failing and we were missing
`set -xeuo pipefail` in our shells. That of course revealed
the ansible tests didn't actually work - my only defense
here is spending so much time fighting to get it through CI
and trying something new.
Anyways, to make the staged-deploy tests work we need a task
that actually uses `rpm-ostree override` rather than `usroverlay`.
Let's make this a bit saner and have a clean split between
tests that are "shell-script+usroverlay" and "ansible+override".
Closes: #1577
Approved by: jlebon
Jonathan Lebon [Fri, 4 May 2018 14:13:14 +0000 (10:13 -0400)]
lib/commit: Fix function name typo in docstring
Closes: #1575
Approved by: cgwalters
Jonathan Lebon [Fri, 4 May 2018 14:13:13 +0000 (10:13 -0400)]
lib/deploy: Add semi-colon in post-deployment msg
Let's add a semi-colon between the "bootconfig swap" part and the
"deployment count change" to make it more clear they're separate
statements.
Closes: #1575
Approved by: cgwalters
Colin Walters [Fri, 4 May 2018 01:32:56 +0000 (21:32 -0400)]
tests: Tweak staged-deploy test to be faster
Work around https://github.com/ostreedev/ostree/issues/1569
Closes: #1573
Approved by: jlebon
Colin Walters [Fri, 4 May 2018 01:55:54 +0000 (21:55 -0400)]
README: Tweak licensing description
Basically it wasn't clear that the man pages and API doc
remain LGPLv2.
Closes: https://github.com/ostreedev/ostree/issues/1456
Closes: #1574
Approved by: smcv
Colin Walters [Wed, 2 May 2018 15:59:21 +0000 (11:59 -0400)]
deploy: Use fdatasync() for new kernel/initramfs by default
While we do a `syncfs()` plus `FIFREEZE/THAW` for `/boot`, that
only comes during deployment finalization.
The code here today generally assumes that if the file exists
it's been fully written. So let's do a `fdatasync()` before
we do the `rename()`.
This just came out of looking through the code while working
on deployment staging. In that scenario there's a much larger
window between when we copy the kernel/initramfs and when we
sync `/boot`.
Closes: #1571
Approved by: jlebon
Colin Walters [Wed, 2 May 2018 16:17:20 +0000 (12:17 -0400)]
lib: Use `Locking:` term in docs
This is easier to `git grep` etc. versus ad-hoc English. Although
we still have some English for the prepare_transaction/commit which
acquire/release in separate phases.
Closes: #1572
Approved by: jlebon
Colin Walters [Wed, 2 May 2018 14:33:32 +0000 (14:33 +0000)]
lib/deploy: Do post-ops when removing staged commit
These are further fixes based on running more of the rpm-ostree
test suite.
When dropping the staged deployment, we do need to do the
"post operations" such as bumping the sysroot mtime, so that
clients know something changed. We also need to regenerate
the deployment refs. And of course do a sysroot reload.
Also, add a "base cleanup" after creating a staged deployment
which also regenerates the refs.
Closes: #1570
Approved by: jlebon
Colin Walters [Tue, 1 May 2018 20:36:03 +0000 (16:36 -0400)]
lib/deploy: Throw an error if trying to stage when not ostree-booted
There's no reason to do this. I didn't actually hit this problem,
but it's a corner case that just occurred to me while working on
the code.
I think callers should be adapted to skip trying to use staging
if there's no booted deployment.
Closes: #1568
Approved by: jlebon
Colin Walters [Tue, 1 May 2018 20:29:55 +0000 (20:29 +0000)]
lib/sysroot: Maintain one variable for "root is ostree booted"
This was pointed out in a previous PR review; we don't have
a need for the separate variables. Prep for adding an API for
this.
Closes: #1568
Approved by: jlebon
Colin Walters [Mon, 30 Apr 2018 13:46:29 +0000 (09:46 -0400)]
repo: Add checksum to error message opening unreadable object
This would have debugged trying to do a pull as non-root from
a sysroot repository. See for example:
https://github.com/ostreedev/ostree/issues/1562
Closes: #1564
Approved by: jlebon
Colin Walters [Mon, 30 Apr 2018 18:41:30 +0000 (14:41 -0400)]
deploy: Don't prune repo at finalization time by default
Doing so can break rpm-ostree, which wants to own the cleanup process
to ensure its baselayer refs are generated.
Further, doing the cleanup at shutdown time adds latency. It's also
going to be generally unnecessary as we expect repo pruning to have
been done when writing the refs.
Closes: #1567
Approved by: jlebon
Colin Walters [Mon, 30 Apr 2018 15:29:47 +0000 (11:29 -0400)]
bin/admin-cleanup: Port to decl-and-initialize style
No functional changes.
Closes: #1567
Approved by: jlebon
Simon McVittie [Thu, 26 Apr 2018 17:29:49 +0000 (18:29 +0100)]
build: Don't distribute Bison-generated parser in dist tarballs
Signed-off-by: Simon McVittie <smcv@collabora.com>
Closes: #1563
Approved by: cgwalters
Jonathan Lebon [Mon, 30 Apr 2018 13:42:11 +0000 (09:42 -0400)]
man/ostree-init: Briefly describe various modes
Closes: #1561
Closes: #1560
Approved by: cgwalters
Jonathan Lebon [Mon, 30 Apr 2018 12:53:01 +0000 (08:53 -0400)]
man/ostree: Document --repo option a bit more
This new information is already mostly part of `ostree.repo(5)`, though
let's put it in `ostree(1)` as well since that's where the switch is
officially documented.
Closes: #1560
Approved by: cgwalters
Colin Walters [Mon, 23 Apr 2018 21:53:04 +0000 (17:53 -0400)]
lib/repo: Enable locking by default, but drop external API
The code has been sitting around for a while but since I disabled
it by default, I doubt anyone is really using it or relying on it.
This patch and turns on locking by default, and also drops the
API which was only public in the experimental API builds.
Conceptually these are two distinct things, and we
may actually want to split up the patches.
I don't think this will break anyone, but it's hard to say for sure.
It's also going to be hard to find out until we actually release
I suspect...
But anyone who is broken should be able to add `locking=false` into
their repo config. On the flip side Endless has been shipping with
this enabled and it is reported to help.
The reason to drop the APIs: I'm a bit concerned about the interactions over time
between libostree's use of the API and any apps that start using it.
For example, if an app specifies a SHARED lock in their code, then
later internally we decide to temporarily grab an `EXCLUSIVE`, but the
app had a second thread/process that was `EXCLUSIVE` already, and
that process was waiting on the first bit of code, then we could
deadlock. I can't think of a real world situation where this would happen
yet though.
We are likely to in the future have say `fsck` take an external lock,
`checkout` grab a shared one, etc.
Closes: #1555
Approved by: jlebon
Colin Walters [Mon, 23 Apr 2018 21:01:53 +0000 (17:01 -0400)]
README.md: Fix docs link to COPYING
Because `README.md` also gets rendered into the docs, we need
to link directly to github.
Closes: https://github.com/ostreedev/ostree/issues/1534
Closes: #1554
Approved by: jlebon
Colin Walters [Fri, 27 Apr 2018 19:33:02 +0000 (15:33 -0400)]
deploy: Return staged deployment
Today rpm-ostree has some code to run a "sanitycheck" on a deployment.
I had initially deleted that when adapting it to use the staging code,
but I realized it should work fine; we just won't see the merged
config, but that's OK.
When I readded that code it started crashing because we didn't
actually return the new deployment object. We'll gain some coverage
here as I'll land the code to have rpm-ostree use staging, then bump
the rpm-ostree tests here.
Closes: #1559
Approved by: jlebon
Colin Walters [Fri, 27 Apr 2018 15:58:50 +0000 (11:58 -0400)]
bin/deploy: Avoid loading merge deployment kargs unless necessary
The fact that `ostree admin deploy` always itself loaded the
merge kargs masked a bug in the core. Let's change our tests
to not pass any kernel arguments to ensure we cover this.
The new logic in the CLI is a bit subtle, but if you read
carefully is a lot clearer I believe. Basically we have one
of a few "starting points" in the first section, which can
then be further augmented.
Closes: #1558
Approved by: jlebon
Colin Walters [Fri, 27 Apr 2018 15:53:43 +0000 (11:53 -0400)]
lib/deploy: Fix staged deployments with no kargs
Testing out the staged API with rpm-ostree, ostree-prepare-root.service
in the initramfs was failing. Turned out that was because we didn't
have a `root=` kernel argument. Which was because we didn't have
any kernel arguments at all except `ostree=`.
That in turn was because we weren't loading the bootloader config
from the merge deployment.
The serialized deployment data holds the unique identity of
(osname, checksum, deployserial) - look for the real merge deployment
in our deployment list which has the bootloader arguments we need.
This issue was entirely masked by the `ostree admin deploy` command
which itself explicitly loads the merge deployment's kernel arguments
in every case - it never passes the `NULL` default down. A followup
patch will fix that.
Closes: #1558
Approved by: jlebon
Jonathan Lebon [Tue, 24 Apr 2018 16:51:38 +0000 (12:51 -0400)]
lib/deploy: Also compare deployment csum versions
When comparing deployments to determine whether we need a new
bootversion, we should also check whether the commit "version" metadata
is the same. Otherwise, we may end up with the a bootconfig whose
`title` includes a version that doesn't match the one from the
deployment checksum.
Closes: https://github.com/projectatomic/rpm-ostree/issues/1343
Closes: #1556
Approved by: cgwalters
Jonathan Lebon [Tue, 24 Apr 2018 16:50:11 +0000 (12:50 -0400)]
lib/deploy: Factor out function to get deployment kargs
No functional change. Prep for next commit.
Closes: #1556
Approved by: cgwalters
Jonathan Lebon [Mon, 23 Apr 2018 17:36:38 +0000 (13:36 -0400)]
ci: drop
BDB1539 workaround
This shouldn't be an issue anymore.
Closes: #1553
Approved by: cgwalters
Jonathan Lebon [Thu, 19 Apr 2018 13:58:51 +0000 (09:58 -0400)]
tests: Port the last python2 script to python3
This is not used by any test, nor is it packaged. Though let's just port
it over to py3 to certify our codebase completely py2-free. I've
manually checked that the script is still functional.
Closes: #1546
Approved by: cgwalters
Jonathan Lebon [Thu, 19 Apr 2018 13:58:49 +0000 (09:58 -0400)]
tests/installed: Prefer python3 over python2
In a world progressively unapproving of python2, let's be a bit smarter
and support testing on platforms that only have python3 installed.
Closes: #1546
Approved by: cgwalters
Jonathan Lebon [Thu, 19 Apr 2018 14:16:35 +0000 (10:16 -0400)]
ci: Temporary libgcrypt workaround for older kernels
I'm trying to get ostree tests to pass in OpenShift as part of our CI
move but I've been seeing lots of failures related to GPG tests. It
finally turned out to be because libgcrypt doesn't behave well on older
kernels that don't have `getrandom()` (the cluster is running on RHEL7).
Thankfully, there's a new build with a fix for this. Pull that in
manually until it gets into stable.
For more information, see:
https://bugzilla.redhat.com/show_bug.cgi?id=
1542453
Closes: #1547
Approved by: cgwalters
Jonathan Lebon [Mon, 23 Apr 2018 13:23:17 +0000 (09:23 -0400)]
ci: mark some ci testsuites as required again
Follow up to #1536; we are now running all the testsuites on merges, but
we weren't actually blocking on their success!
Closes: #1552
Approved by: cgwalters
Colin Walters [Fri, 20 Apr 2018 18:17:20 +0000 (14:17 -0400)]
tests: Disable itest-pull.sh since it is too slow
Hopefully we'll fix this soon.
Closes: #1548
Approved by: cgwalters
Colin Walters [Fri, 20 Apr 2018 18:16:15 +0000 (14:16 -0400)]
tests: Lower retry timeout to 5s
No need to poll every second, there's going to be some latency
here and we want to avoid the overhead of polling.
Closes: #1548
Approved by: cgwalters
Colin Walters [Wed, 18 Apr 2018 18:36:19 +0000 (18:36 +0000)]
fsck: Only print "marking commit partial" once
Let's only print if the commit isn't already partial; this
addresses a spam of "marking commit partial" from fsck.
Closes: #1548
Approved by: cgwalters
Jonathan Lebon [Wed, 18 Apr 2018 19:57:59 +0000 (15:57 -0400)]
tests/installed: increase async retries to 500
It seems like 240 retries is just not long enough for all the
non-destructive tests running in parallel to finish. Let's crank that up
to 500 retries.
Closes: #1548
Approved by: cgwalters
Colin Walters [Thu, 19 Apr 2018 19:53:58 +0000 (15:53 -0400)]
tests/installed: Make reboot task less racy
This took a whole lot of experimentation. I hit upon the idea
of doing a `systemctl stop sshd` to avoid the situation where we
might ssh back into the system while it's in the process of shutting
down.
Ultimately the other fix is disabling `ControlMaster`; see
for example: https://github.com/ansible/ansible/issues/17935
Closes: #1548
Approved by: cgwalters
Matthew Leeds [Tue, 17 Apr 2018 21:35:52 +0000 (14:35 -0700)]
man: Add man page for create-usb
Closes: #1543
Approved by: cgwalters
Matthew Leeds [Mon, 26 Mar 2018 07:01:39 +0000 (00:01 -0700)]
create-usb: Update summary in destination repo
Currently the create-usb command only generates a summary file in the
destination repo if one doesn't already exist, which means if one does
exist it becomes out of date after the new refs are pulled. This commit
makes ostree regenerate the summary regardless of whether it exists, so
that consumers such as ostree_repo_find_remotes_async() (and at a higher
level, GNOME Software) get an accurate picture of the refs available on
the mount. This commit also updates one of the unit tests to check that
the summary is accurate after a second pull into the same repo.
Since any user of the create-usb command is using collection IDs they
are new enough to be using the unsigned summary support. While it would
technically be possible to use summary signatures on a repo and use the
create-usb command on it (a scenario broken by this commit), the
create-usb command is designed for P2P distribution of refs, which
requires use of unsigned summary support. So this is a legitimate
narrowing of the tool.
Fixes https://github.com/ostreedev/ostree/issues/1465
Closes: #1543
Approved by: cgwalters
Matthew Leeds [Mon, 26 Mar 2018 06:57:38 +0000 (23:57 -0700)]
tests: Fix typo in unit test
Closes: #1543
Approved by: cgwalters
Sam Spilsbury [Tue, 16 Jan 2018 01:23:11 +0000 (09:23 +0800)]
avahi: Don't complain with g_warning if the daemon wasn't running
This is a normal case when running unit tests in client code
on continuous integration infrastructure. When those tests are
running they will set G_DEBUG=fatal-warnings which will cause
the program to abort if a warning is emitted. Instead, emit
a debug message if the problem was that we couldn't connect to
the daemon.
Closes: #1542
Approved by: jlebon
Colin Walters [Thu, 12 Apr 2018 16:40:08 +0000 (12:40 -0400)]
lib/sysroot: Move staged into deployment list, rework handling
Followup to: https://github.com/ostreedev/ostree/pull/1503
After starting some more work on on this in rpm-ostree, it is
actually simpler if the staged deployment just shows up in the list.
It's effectively opt-in today; down the line we may make it the default,
but I worry about breaking things that e.g. assume they can mutate
the deployment before rebooting and have `/etc` already merged.
There's not that many things in libostree that iterate over the deployment
list. The biggest change here is around the
`ostree_sysroot_write_deployments_with_options` API. I initially
tried hard to support a use case like "push a rollback" while retaining
the staged deployment, but everything gets very messy because that
function truly is operating on the bootloader list.
For now what I settled on is to just discard the staged deployment;
down the line we can enhance things.
Where we then have some new gymnastics is around implementing
the finalization; we need to go to some effort to pull the staged
deployment out of the list and mark it as unstaged, and then pass
it down to `write_deployments()`.
Closes: #1539
Approved by: jlebon
Jonathan Lebon [Tue, 17 Apr 2018 19:21:04 +0000 (15:21 -0400)]
ci: use gpgme scratch build to workaround issues
Temporarily work around gpgme issues until the package gets into stable.
For more information, see:
https://src.fedoraproject.org/rpms/gpgme/pull-request/3
https://github.com/ostreedev/ostree/pull/1539
Closes: #1540
Approved by: cgwalters
Alexander Larsson [Fri, 6 Apr 2018 13:39:43 +0000 (15:39 +0200)]
fsck: Mark commits with missing or deleted object partial
This means we can later use various operations to heal the repository
because ostree does not assume all objects are there.
This the begining of a fix for https://github.com/ostreedev/ostree/pull/345
Closes: #1533
Approved by: cgwalters
Alexander Larsson [Fri, 6 Apr 2018 13:37:45 +0000 (15:37 +0200)]
lib/repo: Add ostree_repo_traverse_commit_union_with_parents
This is a version of ostree_repo_traverse_commit_union that also
remembers where the objects came from, by recording the parent
relationships in a hashtable. This can be used to later find which
commits each object was from, which we want to use in fsck.
Closes: #1533
Approved by: cgwalters
Giuseppe Scrivano [Thu, 29 Mar 2018 15:10:41 +0000 (17:10 +0200)]
commit, payload-reflink: do not write to the parent repo
reintroduce the feature that was reverted with commit:
28c7bc6d0e153a0b07bdb82d25473a490765067f
Differently than the original implementation, now we don't attempt any
test for reflinks support on the parent repository, since the test
requires write access to the repository.
Additionally, also check that the two repositories are on the same
device before attempting any reflink.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #1525
Approved by: cgwalters
Colin Walters [Tue, 3 Apr 2018 20:22:31 +0000 (16:22 -0400)]
switchroot: Don't log if running as pid1, minor code style cleanups
If we're running as pid1, avoid printing anything in the normal
success paths as we don't want to affect the physical console by
default; the device may be using a splash screen, etc.
Also cleanup the code a bit to use a single variable
`running_as_pid1`, declare-and-initialize, use the
`bool` type, etc.
Closes: #1531
Approved by: jlebon
Colin Walters [Fri, 13 Apr 2018 12:56:28 +0000 (08:56 -0400)]
sysroot: Clean up origin loading function
In prep for staging work, where we'll need to load the origin
for the staged deployment too.
The function was previously trying to avoid operating on an
instantiated deployment, but the data we need is in the deployment
object at that point.
Closes: #1538
Approved by: jlebon
Colin Walters [Thu, 12 Apr 2018 16:53:17 +0000 (12:53 -0400)]
deploy: Silently do nothing if passed same set of deployments
Prep for handling staged deployments better; if we're not passed
the staged one back, then we just want to delete it but not
touch the bootloader config.
Closes: #1538
Approved by: jlebon
Colin Walters [Thu, 12 Apr 2018 16:43:39 +0000 (12:43 -0400)]
deploy: Clean up bootserial assignment function
The reason we were returning a hashtable is a bit lost to history,
there's no reason to do so now anyways. Also port to declare-and-initialize
style and add more comments.
Closes: #1538
Approved by: jlebon
Colin Walters [Thu, 22 Feb 2018 20:27:59 +0000 (15:27 -0500)]
Add concept of "staged" deployment
Add API to write a deployment state to `/run/ostree/staged-deployment`,
along with a systemd service which runs at shutdown time.
This is a big change to the ostree model for hosts,
but it closes a longstanding set of bugs; many, many people have
hit the "losing changes in /etc" problem. It also avoids
the other problem of racing with programs that modify `/etc`
such as LVM backups:
https://bugzilla.redhat.com/show_bug.cgi?id=
1365297
We need this in particular to go to a full-on model for
automatically updated host systems where (like a dual-partition model)
everything is fully prepared and the reboot can be taken
asynchronously.
Closes: https://github.com/ostreedev/ostree/issues/545
Closes: #1503
Approved by: jlebon
Jonathan Lebon [Wed, 11 Apr 2018 20:45:40 +0000 (16:45 -0400)]
ci: turn gating back on for most testsuites
Somehow, this slipped through in #1513. We weren't inheriting anymore,
so `branches` defaulted back to just `master`. This means we weren't
gating on most of the containerized builds anymore. Ouch!
It'd make sense to teach PAPR to allow some defaults across all
testsuites, even in the `inherit: false` case. Though it's tempting to
also just change the hardcoded PAPR default to those branches since our
use of Homu + PAPR at this point is pretty ubiquitous, and it doesn't
really hurt for the ones that don't use it.
Closes: #1536
Approved by: cgwalters
Owen W. Taylor [Wed, 11 Apr 2018 22:06:39 +0000 (18:06 -0400)]
Don't scan uncompressed_objects_dir if it doesn't exist
A newly created archive-mode repository won't have a uncompressed-objects-cache
directory, and uncompressed_objects_dir is -1 to flag that. The special meaning of
-1 meaning "cwd" for libglnx means that the current directory was scanned as
if it was an objects directory, producing unexpected results, especially if there
were any two-letter files/subdirs in the current directory.
Closes: #1537
Approved by: jlebon
Colin Walters [Wed, 11 Apr 2018 17:33:31 +0000 (13:33 -0400)]
tests/installed: Move tasks into tasks/ directory
It's cleaner to separate test playbooks from their tasks.
Closes: #1535
Approved by: jlebon
Colin Walters [Wed, 11 Apr 2018 17:31:18 +0000 (13:31 -0400)]
tests: Better error message if target is not a symlink
I broke the code for this and ended up adding this to debug it.
Closes: #1535
Approved by: jlebon
Colin Walters [Wed, 11 Apr 2018 17:30:32 +0000 (13:30 -0400)]
sysroot: Split out a helper function to delete a deployment dir
Prep for staged deployments.
Closes: #1535
Approved by: jlebon
Colin Walters [Wed, 11 Apr 2018 17:27:15 +0000 (13:27 -0400)]
tests/installed: Move auto-build logic to playbook-run.sh
This makes it a bit more convenient to make a code change, then
`rm -rf build && ./playbook-run.sh ...`.
Closes: #1535
Approved by: jlebon
Colin Walters [Sat, 7 Apr 2018 15:40:53 +0000 (11:40 -0400)]
bin: Hide `admin instutil` command
Add a "hidden command" flag, and use it for `admin instutil` since
I regret adding it, and people should be using the API.
Prep for adding another hidden command as part of staging deployments.
(Down the line we should investigate deduplicating the recursive
command parsing code)
Closes: #1535
Approved by: jlebon
Colin Walters [Thu, 22 Mar 2018 20:40:35 +0000 (16:40 -0400)]
tests: Merge installed/ and fedora-str/ directories
Let's be opinionated now, and our installed/ test story *is*
Ansible/STR. Merge `tests/fedora-str` into `tests/installed/`.
Rework the nondestructive tests into a separate playbook run, and parallelize
them for more efficiency.
The destructive tests are also changed to use Ansible more.
Add a higher level `run.sh` entrypoint and update the `README.md`
with some useful tips.
Closes: #1513
Approved by: jlebon
Matthew Leeds [Wed, 28 Mar 2018 07:31:05 +0000 (00:31 -0700)]
lib/repo: Add timestamps to OstreeRepoFinderResult
Currently OstreeRepoFinderResult, a data structure used by pull code
that supports P2P operations, has a hash table mapping refs to checksums
but doesn't include timestamp information. This means that clients have
no way of knowing just from the OstreeRepoFinderResult information if a
commit being offered by a peer remote is an update or downgrade until
they start pulling it. The client could check the summary or the commit
metadata for the timestamps, but this requires adding the temporary
remotes to the repo config, and ostree is already checking timestamps
before returning the results, so I think it makes more sense for them to
be returned rather than leaving it to the client. This limitation is
especially important for offline computers, because for online computers
the latest commit available from any remote is the latest commit,
period.
This commit adds a "ref_to_timestamp" hash table to
OstreeRepoFinderResult that is symmetric to "ref_to_checksum" in that it
shares the same keys. This is an API break, but it's part of the
experimental API, and none of the current users of that (flatpak,
eos-updater, and gnome-software) are affected. See the documentation for
more details on "ref_to_timestamp". One thing to note is the data
structure currently gets initialized in find_remotes_cb(), so only users
of ostree_repo_find_remotes_async() will get them, not users of, say,
ostree_repo_finder_resolve_all_async(). This is because the individual
OstreeRepoFinder implementations don't currently access the timestamps
(but I think this could be changed in the future if there's a need).
This commit will allow P2P support to be added to
flatpak_installation_list_installed_refs_for_update, which will allow
GNOME Software to update apps from USB drives while offline (it's
already possible online).
Closes: #1518
Approved by: cgwalters
Alexander Larsson [Tue, 3 Apr 2018 09:36:57 +0000 (11:36 +0200)]
pull: Don't save summary to cache before validating signatures
In case of some kind of race or other weirdness we might be getting
non-matching versions of summary.sig and summary, where summary.sig
is the latest version. Currently we're saving them to the cache
directly after downloading them successfully, but they will then fail
to gpg validate. Then on the next run we'll keep using the cached files
even if they are incorrect, until summary.sig changes upstream.
This changes the order so that we verify the signatures before saving
to the cache, thus ensuring that we don't end up in a stuck state.
Fixes https://github.com/ostreedev/ostree/issues/1523
Closes: #1529
Approved by: cgwalters